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

Change-Id: I63a73cd58a89a2dfddc03cf1d7b662b311c2c2e3