Merge changes from topic "am-7882172707e5453d9160ca56a0a63ffc" into nougat-mr1-cts-dev
am: 941d9e9f6b

Change-Id: I24b0b2bff4c68f185a0ed0ef62cc00a1cf1ef185