Android VTS 9.0 Release 5 (5140538)
Snap for 4677756 from b06c82923869f50e9641f7dac56df0aebe637845 to pi-release

Change-Id: I3e22914eee11c7539daabc36d1219bb309f546dd