Merge changes from topic "am-0662898ddedc463d805b6178203f08df" into oreo-cts-dev
am: 13c178dcf3

Change-Id: I40f67adbb7d274a75f03e1b265dd3fe6ef7e9fff