Android VTS 8.1 Release 5 (4918629)
release-request-a0f7506a-1cd6-4a03-927b-8d29e0c545e6-for-git_oc-mr1-release-4277764 snap-temp-L23600000093606242

Change-Id: I9cebf50518c84ad227e2fe346acaecda708d5c44