Android VTS 9.0 Release 4 (5007851)
Snap for 4620899 from 18669b27bb20d324539ab97e0823b189a4449ffb to pi-release

Change-Id: Iee7394cefa89c8b0e9fea87b7a24f0e0a10303c8