Merge "rpm_log: update the rpm log base address and log length"