Merge "Change the way rkp tool obtains serial number" into main