Merge "Update build numbers for LMY47I shamu"