Merge RP1A.190923.001

Change-Id: I2ef869d06d3c850052d93f6514c0f0d02318ee7d