Merge RP1A.191031.003

Change-Id: I87b19527f39a22b5e8870153de9a6800d7c8b69c