am d44525dc: am b30a8568: Merge "Defer wifi bounce following restore for 1...
am d44525dc: am b30a8568: Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev
* commit 'd44525dc':
Defer wifi bounce following restore for 1 minute...