Android VTS 9.0 Release 17 (7308615)
Snap for 4603395 from 8b170d2ed92ea3d771ce071e42dfff5fa32a66ae to pi-release

Change-Id: I78f4c578ceea467a715aa1fa4f67517cb1850ad8