Merge RP1A.191031.003

Change-Id: I0c089e110a2e4bb49a3e7e0b731c47fadc821ec7