Merge RP1A.191031.003

Change-Id: I7206faa1c949a8b803c4e19c6c854adb2aec1389