DO NOT MERGE Nougat MR2 is 7.1.2
am: 61be03b456

Change-Id: I10e090618d1342d03296f1345fabd1dfb4d94117