Merge "Small clean ups" am: 5cd87d39d7 am: 188072f6a4 am: 22ea80bdcd
am: c68f5b7004

Change-Id: I7a749286d17752b08d0a51678e1dd9c47e4439c1