Merge changes from topic "am-63874c1998a84a9aaa6cc188eb88fa57" into nougat-mr1-cts-dev
am: 1c157082ca

Change-Id: Ibef8c0a518d5fca17bdeda725f0c0cf24b22f81c