Android VTS 9.0 Release 16 (7097246)
release-request-fbd98711-169e-4972-a5f2-db043df00e09-for-git_pi-release-4367572 snap-temp-L13500000107248413

Change-Id: Ie47460612f537d02eacbc596a404631000ed9413