Merge RP1A.191114.001

Change-Id: I684562a842a971da71dffa946e9f5f8f7761badd