Merge RP1A.191114.001

Change-Id: I82da7ecdac0e18f63342f1d6a6825edee1291f89