Merge RP1A.191212.001

Change-Id: Icfda0aa27374eb471d566188e0bf1577f370ff5a