am b11672de: Merge "Add a time margin for deferred enable." into jb-mr2-dev

* commit 'b11672de5272f6dcf7e8f4a9d88f2925cdc4c2dd':
  Add a time margin for deferred enable.