Android VTS 8.1 Release 6 (5035638)
Snap for 4373604 from f21a26bfede697bdb09061c0737414cd82eceeba to oc-mr1-release

Change-Id: I0e5f9e8ef4be7f7fa0fff0892124e63cffd0413e