Merge "Use STOCK_PM_FLAGS for backup agent" into pi-dev