Merge RP1A.200123.001

Change-Id: Ib4b6a49012ef4163f913f8b356632cb3c226ca67