Merge RP1A.191031.003

Change-Id: I38f91325ca65d2f4a068783d061c27c86f33bfa0