Merge "Initial commit of updatable media API"