Merge "Add permissions for upgrade engine required for A/B upgrade"