Merge "Change namespace of ACTION_REQUEST_SHUTDOWN." into oc-dev