Merge RP1A.191031.003

Change-Id: I20e8321453f7846ee2f2f32e3384ef0e7ba8a561