Merge "Add override method to fix building against master support lib." into ub-launcher3-burnaby