* changes: Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 [automerger skipped] DO NOT MERGE CTS for presence of avc fix for b/70897454 am: 2215338715 -s ours
7f0c5e7da8