Merge "Update build numbers for LMY48J"