Merge RP1A.200106.001

Change-Id: I4585062d5d1fbc6903364ca9c1b23db472bb5645