Android VTS 9.0 Release 5 (5140538)
Snap for 4393550 from f663790c00a39f17a529acb1bfddd062655676a6 to pi-release

Change-Id: I744e02675142c93a1aad643d7a4569091e6b6c0c