Merge "Cleanup "NewEra" comment after implementing new Japanese Era" am: 78cb8301f6
am: 50ffc0828f

Change-Id: Ifaae6c347a3ca0ab1cca24d4149d72ed4e17cb0e