Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
am: 7f0c5e7da8

Change-Id: I78b882d59e9587efec84b735d48e58369764eba8