Android VTS 9.0 Release 7 (5338953)
Snap for 4476081 from ddf5f49cb53866fbc503a6349bf44bac24a6963d to pi-release

Change-Id: I606aa731f87f00ae45eff86336abcfd739a0d950