Merge "Deprecate JapaneseCalendar.CURRENT_ERA" am: 0f5893ee60 am: 7f9c43a01e
am: d4a58e4a9a

Change-Id: Ia07beec9ff556378d72fe94881d5ff579e400cbf