Android CTS 5.1 Release 25 (4400433)
Merge "Snap for 4398846 from a0ce80f2c7e71e4c1c49b9004d0457b672805956 to lollipop-mr1-cts-release" into lollipop-mr1-cts-release