Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am: 7fee46383f am: b4969f5b6f
am: f8866e2bfa

Change-Id: I8c6707dceea3a8b695f9259764eaff9a7d2a3938