tree ce72b720421049c0b4094ab8c9843bc6b7ac80bc
parent 05c1dac4b6415c151bd6200f0d7f023d87f46a8d
parent 247a5d039a3997f24fef729325507d0c54b74703
author Eric Erfanian <erfanian@google.com> 1531257364 -0700
committer android-build-merger <android-build-merger@google.com> 1531257364 -0700

Merge changes from topic "ui-update" am: e0dbd9f907
am: 247a5d039a

Change-Id: I46f4cfc54d6d9b74ee54b03be67ea2c61a98e750