Android VTS 9.0 Release 5 (5140538)
Snap for 4386413 from 6e267ffb6f981d1abd9913c5d0d9856771254fdb to pi-release

Change-Id: I9d72116e5e4a7a3b7618119cb42ba782d2c7de0b