Merge changes from topic "am-4532af43002d481bba66a249d6a74576" into nougat-mr1-cts-dev
am: 3bfff62174

Change-Id: Ic6b7c2ca51efefa07d07f25aa8636067dfd15069