Merge RP1A.191120.001

Change-Id: I641433099d011f84556a83c09afdf29de6ff877c