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

Change-Id: I0bcc97f30baf408e6eb6b96f7f37b3b536953fc7