Merge "Initial commit for media apex bundle"