Merge "Updating ro.baseband target property value"