Merge "Load static RROs in OverlayManagerService" into pi-dev