Merge RP1A.200123.001

Change-Id: Iead53aead93d9baa289c29411d885a0303e35df4