Merge RP1A.191212.001

Change-Id: Ib00357f347a7c4aad0a69e127fba77506c4e21ba