Merge "Move MediaItem2 Builder to updatable"