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

Change-Id: I5d6c6d0d5d88ba64dcb02592745a25582ec8d0af