Merge changes Id2ffb056,I2a4e298b

* changes:
  Adjust some behaviors on PermissionMonitorTest
  Use common code