Android VTS 11.0 Release 8 (8478917)
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 531f66d59e -s ours
am skip reason: subject contains skip directive

Change-Id: Id08031034e25877664f2d0fd8e80206ee919217d