Merge RP1A.191114.001

Change-Id: I3524c4d12dc06c72ae8ee67b1564b72acca358b2