Merge RP1A.200123.001

Change-Id: Ic5290bd388bc1414c066c5d823edc8dc72cb4a97