Merge changes from topic "am-79b4f404bf834deeadc8bd86350f043f" into oreo-cts-dev
am: 4db4ec9573

Change-Id: I3ffc630e2d23606a4b7f3ba1430db5b101f8a048