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

Change-Id: I7bbeca356910e78821bff299f1b0e17d14eb9046