[automerger] Merge changes from topic "am-df79034a46694ff0b7e47fa7f8bf9120" into oreo-cts-dev am: de16c72207 am: c7dfd663bf am: 829c4cf876
am: fd45965e18

Change-Id: I55ea6580eb888a40822c26eb5f874ea9bcd88fad