Merge RP1A.200123.001

Change-Id: I6d8a852cfe3642528284a8f33caf6862e5a718e6