Merge RP1A.191031.003

Change-Id: I32e990112e6b89e24ac3c130cd1551bc0e71f65c