tree 03469773cb3dcf9de1579375494751bb24de1a91
parent 151750d84292f71f34998e12fefbb22de1a3f89e
parent 7f0c5e7da85506b71c9785852cebcdde1f1b44b9
author Ray Essick <essick@google.com> 1523317594 -0700
committer android-build-merger <android-build-merger@google.com> 1523317594 -0700

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

Change-Id: I78b882d59e9587efec84b735d48e58369764eba8