Merge "Update build numbers for LMY47D shamu"