Merge RP1A.191031.003

Change-Id: I5419a020ba0e304d07148892cff5d72e9e997c5f