Merge RP1A.200123.001

Change-Id: Ic743b625cb505b2fdac5a2e8aae5439264816eb0