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

Change-Id: Ifbdbf6c739e140eb10c8fafdeaa31b92f281a41b