Merge RP1A.200106.001

Change-Id: I6b870cf9e964eee79b3027125b3bd9c0aa4849be