Android VTS 9.0 Release 4 (5007851)
Snap for 4545621 from 4129a9fb971c629262bf8925b1f1a2fcdb6e0e7c to pi-release

Change-Id: Id26e41ab99e8997b34b724d5a4ea021044893bc7