Merge changes from topic 'am-e2b14667780740de8057d8b60d4d24bb' into nougat-cts-dev
am: 92e51a1756

Change-Id: I8a9683f75639560c74764a5fbe758e14c595b66b