Also made the fields final and grouped them. Bug: 23820259 Change-Id: I725c830d7c73e8cbc01b6a4f4f4991cb42258380