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

Change-Id: I4a7465bfae8fec503987e7587d81e74982fd57b8