Merge RP1A.200106.001

Change-Id: I0892c6a3cbdb5e69f504234adadf21de5bc98fee