Android VTS 8.1 Release 3 (4632653)
Merge cherrypicks of [3400059, 3399862, 3399399, 3399400] into oc-mr1-release

Change-Id: Id969459100218347ba9554cdf554ab8c571f2d0e