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

Change-Id: I9c007c129269a80d9aede31c8980dbd42e9f1f84