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

Change-Id: Ie01c1ba49bd72a4690d2f29689bc94f9fd793cb8