Merge RP1A.200123.001

Change-Id: Icccfc426441bd4c2b59ae7cc0410105cc1ab1d1e