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

Change-Id: I7077de030a59695ea3c1c8d99aa0b5aea3a8ef8a