Merge RP1A.191031.003

Change-Id: I0766a9ca22c14d40524490d48c33117682a4ce74