Merge changes from topic "reiwa_o_mr1_cts" into oreo-mr1-cts-dev am: 86efa9b5a7
am: f84e05907f

Change-Id: I1ec8bac92e089c9c6f5aa3031197282136146a25