Android CTS 8.1 Release 23 (7362606)
Merge "Merge cherrypicks of [1708369, 1708706] into sparse-7343076-L53100000889266365" into sparse-7343076-L53100000889266365