Merge changes from topic "am-803711a2-d9ca-4221-87ac-a897fb7fa0a8" into nyc-dev

* changes:
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6 am: ffe005e5 skipped: b91a366e am: 4fe58458 am: 841ed7f2 am: 0889f3a9 skipped: 62c8e2c8
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6 am: ffe005e5 skipped: b91a366e am: 4fe58458 am: 841ed7f2 am: 0889f3a9
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6 am: ffe005e5 skipped: b91a366e am: 4fe58458 am: 841ed7f2
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6 am: ffe005e5 skipped: b91a366e am: 4fe58458
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6 am: ffe005e5 skipped: b91a366e
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6 am: ffe005e5
  [automerger] DO NOT MERGE Disable overlays while installer is resumed skipped: 308302f6
  DO NOT MERGE Disable overlays while installer is resumed