Merge RP1A.200106.001

Change-Id: I22cf08df3bd494886e5ee216aa2d02909d6fae38