Merge RP1A.191114.001

Change-Id: Ie716f42423433934c94072a8a441131c8426caac