Merge "Update NPMS to inform NMS of the changes in fw rules synchronously." into oc-mr1-dev am: 7a349d7288
am: 99ae0aed0d

Change-Id: If264a7fc7e0300961d8f76c37c74ef2f4ae51088