Merge RP1A.191212.001

Change-Id: I20c11e00c79e0e5fff5420cb00ec5dbcb83563d8