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

Change-Id: Ib7210f7529d9c6dba5b601bd3e47dd612cc64598