Merge RP1A.191031.003

Change-Id: Id6ee77b913150bd7abc2faba6e30fb1720fcabd8