Android VTS 8.1 Release 3 (4632653)
Merge remote-tracking branch 'goog/oc-dev-plus-aosp' into HEAD am: b1d33d360f am: 422f4ecb3a
am: f3a73b7a79

Change-Id: I8d1487d062a19f743e07cb27a4842cae2d2f33db