Merge RP1A.191031.003

Change-Id: Ifbe9f8cd35a6dd8c53eed1e2641146785b28686f