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

Change-Id: I206b95f604d783f54bac9957a030a9335dfdfe4f