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