Merge changes from topic "new_japanese_era_reiwa"
am: 97b3085cf7

Change-Id: Ie7246293d19356c48eb0d55714a869e6339ee8e2