Merge RP1A.191031.003

Change-Id: Ib9c0feb316577f43c2fada7515892ddd377d8a96