Add support for new payload property headers to delay switching slots. am: 02c4942cbf
am: 4f58d77292  -s ours

Change-Id: Ic77a43540a888ad4ee8b444101d975af5f64baf5