Android VTS 9.0 Release 13 (6424703)
Snap for 4693621 from a098a2873549a4d5eaf0b7c6fc77ee79edf349a5 to pi-release

Change-Id: I5f5c61eb0de0baf811b281d6324f9d9b81d884d1