Android VTS 8.1 Release 3 (4632653)
Snap for 4373604 from 5c7eed7f310797b3fe1db45f98a412f6fa71d198 to oc-mr1-release

Change-Id: Iac2f0285780e6f5feb147215761979820ae40664