[automerger skipped] Merge "Mainline API cleanup" am: edff7d5a95 am: afbe1044c7 am: 5e46886ae7 -s ours
am skip reason: Change-Id I2438b3adb6248df7770327a31bbca5797bcfd336 with SHA-1 a513e06296 is in history

Change-Id: Iaa1fc95b79571e2f2b1c9a74872d7373ced71d8b