Merge "Add corinac and remove shafik to/from OWNERS of MediaProvider"