Merge "Add VTS for couple of missing APIs and some cleanup for earlier APIs."