Merge RP1A.200106.001

Change-Id: I92dda56ec0083b5f301e824a8e27c83dcd8d0cc6