Merge "Add support for new payload property headers to delay switching slots." into oc-mr1-dev-plus-aosp
am: 1f0cd182ac

Change-Id: I28ec194c3538b712a8bcbd843c30f7dd36fd51d4