Merge RP1A.191114.001

Change-Id: I10b21f331d493a12d856c75597256b1472ba6efa