Merge RP1A.191120.001

Change-Id: Ic0a3ecb8dd865bb91cec06f2c25518e40e9ce8f2