Merge "Deferred setup banner updates intermittently" into oc-mr1-dev
am: 19e00be16b

Change-Id: I2ba4882632e59141c9b1de697928d5a3a7a413fc