Merge changes from topic "reiwa_p_cts" into pie-cts-dev
am: 56efb716cc

Change-Id: I5909b125c5495366789409ed8419c43d03b5f1c0