Merge RP1A.200123.001

Change-Id: I321dfa235a1fe5b8e694cb289aced9b66059b962