Android CTS 5.1 Release 26 (4485352)
Merge "Snap for 4485005 from 0d0e1aa855b9a829ac6feec97e694d04f810ce12 to lollipop-mr1-cts-release" into lollipop-mr1-cts-release