Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
am: b9a245019a

Change-Id: I93160ff6bf44b8d186f86e0c54ea463df48dbfc5