Merge RP1A.191212.001

Change-Id: I2abee51f8f29252bf5e346aa7e4b35ebe4cb88e0