Merge RP1A.191114.001

Change-Id: Ibf0d096d2209de7c124565f042f2bfe682a05753