Merge RP1A.200123.001

Change-Id: I247dd6cf44a29125ec62d9574676befc93847f8f