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

Change-Id: Ifb47bd38f254e25820bf1bfb62a158ac7631b434