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

Change-Id: Ibda5cebb569720eae6fa4001a774a13d99ebf04b