Merge RP1A.191212.001

Change-Id: Ie212f6bdb7ae051ee93fbad542accdf7dba751af