Merge RP1A.200123.001

Change-Id: I91fea1c6186382188fe874e2f92d6c894873f219