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

Change-Id: Ie7bbb7a2360dfa294d722d22154b538c11f7f3f8