[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c

Change-Id: I53c7b8443006ee10731ca9042526ec539fc23078