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

Change-Id: I1968eb36c2f4fafd33846ec0f91710c665d936e6