Merge RP1A.200123.001

Change-Id: I16a4437d9876db7a6a2b07231b4584df4564bee4