Merge "DO NOT MERGE" into nougat-mr1-cts-dev am: 01d748c290  -s ours
am: 15a4870295

Change-Id: Ib8db5a37da2128221e936fd6381ff656f414b906