Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." am: 60449e68d1
am: 516a71e295

Change-Id: I55111cddfd5101bfdccc82bdfa07013187d6f95f