Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev