Merge "Fix Automated API Review issues."
am: ec10005a72

Change-Id: If857f52254b7891c026deb107be5a108d120dfb9