Merge changes from topic "am-6e846588ec5d49759933a1563376ee0c" into oreo-mr1-cts-dev am: 93e43f1a am: 70c49593 Change-Id: Ief6abc6f492352f77cacc1ec64acd2abd99fc642