Merge RP1A.191031.003

Change-Id: Ia3834bb27201b799eece4fabde54824cad8aff26