Merge "LegacyGlobalActions.java: add missing @Override annotations"