Merge RP1A.200123.001

Change-Id: I617460b595033d656cd6c7651ebf0eecfed71783