Android CTS 6.0 Release 23 (4337277)
Merge "Adopting refactoring from 145321" into studio-1.3-dev automerge: 9f667c6
automerge: 59c24b5

* commit '59c24b5d7857e287db15348d55e561ffff6d733a':
  Adopting refactoring from 145321