Merge "Remove APIs that are not directly usable." am: 9cff57312d am: 086be31642
am: 933c625a92

Change-Id: I973390be918acec70733942c84e11700a9df71b1