Merge changes from topic "n" into nougat-cts-dev am: 909e19ad50 am: 8fbd99f6d9 am: 6ebba1230a am: 3797c943dc am: 2a16535e40
am: 09a3a15afe

Change-Id: Ib7e7465076cc818c0523253a0ee19563245217e6