[automerger skipped] Merge "Support for API cleanups." am: eeb095aa am:...
[automerger skipped] Merge "Support for API cleanups." am: eeb095aa am: 4324282b am: d900ec89 -s ours
am skip reason: Change-Id I1f446d81859fa109d74af3661a42a0bd224de5aa with SHA-1 2e90ec07 is in history
Change-Id: I805be3451d1169f8a4b0d1927f41ac380c130fa6