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

Change-Id: I81cf5f1bef06b9e3307df38d2e9e942f4be5f1e7