Merge RP1A.191031.003

Change-Id: I4f4e6574537fad9416448e1b8ee1278518f32492