Android CTS 8.1 Release 16 (5732005)
release-request-d3de000d-8c5a-4c3c-b63e-e989421d7762-for-git_oc-mr1-release-4176727 snap-temp-L91200000081901352

Change-Id: I312908cda127881f0170b5bf218641435e50c76e