Merge changes from topic "o" into oreo-cts-dev
am: 8077dd3dea

Change-Id: Ia3ade2af5b33585cda50b26b496dafb07a166b91