Android 7.1.1 DP1 / SDK API 25.0.0 am: eab7e3000a
am: c71e12d8c8

Change-Id: I5645009a5b6b07ec2abfbdf5168fafe85501559d