Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs."...
Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs." am: 60449e68 am: 516a71e2
am: 0f8a067a
Change-Id: Ifbdbf6c739e140eb10c8fafdeaa31b92f281a41b