[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7

Change-Id: If7be053b905cd763f1aa7b50e5d4b1c91cb86255