Merge changes from topic "n1" into nougat-mr1-cts-dev am: 487ebc4c78
am: f18cae8f11

Change-Id: I4b9a5a91bd54c1d1b04a9755962353b71a03c5eb