Merge RP1A.191031.003

Change-Id: I7b14f49d72161c2e3d0a5085a557834c2aeb7cec