[automerger skipped] Merge "API Review cleanups." am: f2a5615087 am: 1ce250aaea am: ffbb29d8e1 -s ours
am skip reason: Change-Id I1f446d81859fa109d74af3661a42a0bd224de5aa with SHA-1 754493b82f is in history

Change-Id: Ic06666790719488dde87efd9dc372a48c5d63653