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

Change-Id: I5f95fe50d16b26601405816625f4aa45f2ef6647