Merge RP1A.191031.003

Change-Id: Id3fcb78916b21176c333da44289a0630663c9f12