Merge "Let Currency.getDisplayName(null) throw NPE." am: a4dc778ff7 am: f50f62ceb7
am: b5e06436b3

Change-Id: I84e28e864d066c2469c80680b82e1931aeb50593