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

Change-Id: Ie85f29b7d807f2078cff7e5e2a14ce5d7dc64983