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

Change-Id: I0045019061b59d08e576a0c343f694804668870a