Merge "API review cleanups/changes." am: 9324d6513b
am: dd4bc7c69c

Change-Id: I40b7b0f025de54e6f92764949ba3d06370d45cd6