Merge "Update padding values" into pi-car-dev