Merge RP1A.200106.001

Change-Id: I411a9439a19ec6062d190605641fc86b5974faf6