Merge "add explicit 32-bits of padding to UidTrackingInfo struct"