Merge RP1A.200123.001

Change-Id: Iaff29930b9fb059ddb7c89c93f2d012e95e16e41