Merge RP1A.191120.001

Change-Id: I97501ae2b1768377191a28d734e273ff473f0ee9