Merge RP1A.200304.001

Change-Id: I992f8c77dff315c343471a6567df0ac2b4cf856a