Android CTS 8.1 Release 3 (4624669)
Merge tag 'v2.7.13' am: 181a615a16 am: e4771c1870 am: 621291c25a
am: e9b0a5089d

Change-Id: I11c06c6039d12d1b4540e56fb6f679ea7844bacf