Merge RP1A.200123.001

Change-Id: Id74497b533e582db6cc609c880ddc39ba5180593