Merge RP1A.191031.003

Change-Id: I82d4757a6e1f04e12ab4446ddfeb695bdbec52c6