Merge RP1A.191212.001

Change-Id: Id91f95b2d2843233ca110f573cf051b29b2c09fb