Merge RP1A.191031.003

Change-Id: Iac06741d5d8bd9a31eed74bf78db3005b7bf69c6