Merge RP1A.191024.001

Change-Id: I739a0d2c9fe11203e3d0f53bac77489bad28a917