Merge RP1A.191031.003

Change-Id: Ib120d08cdc7f3fc9db96774d9fdc1d9ed7312e2c