Merge RP1A.200106.001

Change-Id: Ia16c1adbe47d05dd03176fab48289a786be3f487