93c0512b28
1. Make instance variables final 2. Get rid of explicit type arguments that can be inferred 3. Get rid of redundant initializer 4. Get rid of unnecessary ; Bug: 62466540 Change-Id: Ia534fb032c20447e604011d466aa3efdfade4027