[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 3a02307c0e am: b3b8308adc

Change-Id: Ic6d9fab85f79423e2543caab1d8fd398adbd2e5d