Merge "ignore RemoteException from pm if shutdown is already on-going" into oc-dev