Merge RP1A.200123.001

Change-Id: I692879bfbfc574f327e44ad5cd92be832f6b9122