Merge "Update standby firewall rules when an app came out of standby mode." into oc-mr1-dev am: f523c630e4
am: 2c6b1400ea

Change-Id: I93d9e01a58c3bafb0b38d7e6655d806681e048f6