Merge "Mainline API cleanup" am: edff7d5a95 am: afbe1044c7

Change-Id: I7e9767fdb53c785ae56f6ae242439bd31c2e85a0