Merge "[automerger skipped] Merge "API review feedback changes" am: 84ea11384d am: 6c1815ac79 am: 8d824a7786 -s ours am skip reason: change_id I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2 with SHA1 20d71403b8 is in history"