Merge RP1A.200123.001

Change-Id: I15028a398026de663e0971f8c5cd77427736d8e0