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

Change-Id: Ic19bdebe1b1484aa66c4caf5d6971c5ca4158724