Merge RP1A.191203.001

Change-Id: I875b9e74ba41068978f2a6f3613ee92b62287075