Merge RP1A.190822.001

Change-Id: I19ae8d7e98f8995ab2ff1b071e3c33bcd85d01d4