Android CTS 8.1 Release 10 (5009339)
Snap for 4373604 from cde06170975675afca1b64e4ab6c20c3ce228f8d to oc-mr1-release

Change-Id: I514ebb3415f86bf65751a534ba26d686ded2f692