Android VTS 8.1 Release 9 (5787880)
Snap for 4373604 from 091665ce5d625191fa83924f4c4ad2fb7b7868a2 to oc-mr1-release

Change-Id: Ie49f96e746be65fd067322164eed5c5075453fb8