Merge "Mainline API cleanup"
am: edff7d5a95

Change-Id: I6969dbc12ea4cf86c7ce231e4c794e45c48fb839