Merge RP1A.200204.001

Change-Id: Ib4e45cb3f1661960c7783bf25ab94f2f143e7e28