Android VTS 9.0 Release 7 (5338953)
merge in pi-release history after reset to master