Android CTS 8.1 Release 8 (4902914)
Snap for 4391495 from af318047ff761b47b154b862f7b259a73728b3de to oc-mr1-release

Change-Id: Ibd8e813eba88856c74dac22fc23a860858ec4507