Merge "Cleanup "NewEra" comment after implementing new Japanese Era"