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

Change-Id: I1e379df95c391136832a8de6a9a1813d494adb7d