Merge "Fix Automated API Review issues." am: 814bb8f627
am: 69aa833953

Change-Id: I29f4cb581574f2542d461de6a0939e58bfc88059