Merge changes from topic "n" into nougat-cts-dev am: a220d6d27d am: c6743de860 am: d58943f9bd
am: c6545ebce1

Change-Id: Ie8d9cf63e077a46a295f9314658ef3633b5e753b