Android VTS 8.1 Release 4 (4766758)
release-request-c9e3b153-009d-4386-b83e-337752602795-for-git_oc-mr1-release-4111654 snap-temp-L22900000075285650

Change-Id: I00b40d766a316fcb5c6f700d34b4f8b6394f9205