Merge "Fix AKISerialNumberTest." into pie-cts-dev