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

Change-Id: I6b9b8871dc6108cd9a056f289febc75f506b8953