[automerger skipped] Merge "API cleanups." am: 1f54023761 am: ed625ec66c am: 1624b481c7 -s ours
am skip reason: Change-Id I2e6d7c8279e09479fbbf952b409680273a315519 with SHA-1 83adc05e5b is in history

Change-Id: I91ab3bdce7e54ec1943e9cffbca587c9b79520ff