Android CTS 8.1 Release 13 (5240576)
release-request-fd631211-effa-4885-9314-559fcbd0a094-for-git_oc-mr1-release-4308825 snap-temp-L52700000098265170

Change-Id: Id53e363fc0fe18e215ad020928b94d37c8bfefea