Merge changes from topic "am-6b57b7386ef246a589ff8148ff9eae8b" into oreo-cts-dev
am: fa209394f0

Change-Id: Ib97632986b715e1ae2148287d0d6d530bb5124ad