Merge RP1A.191031.003

Change-Id: Iee02f6df0fba5296e05f7115a30a79ffe21cc517