Merge "Add markers for new Japanese Era related files" am: afb2cf1085

Change-Id: I10f0532afdf95bef28cf28baaa3f1cdb04d9ff6d