Merge RP1A.191212.001

Change-Id: I7399b5ebb58b95651b42caa585d38fe5fb0b3bf3