Merge "Add parameter for serial number property to rkp tool" into main