Merge RP1A.200123.001

Change-Id: I06610743959799b83ef8518582a803635e480715