Merge "Remove preloaded media route resources" into oc-mr1-dev
am: a6d62d7b8d

Change-Id: I7aefc986591b5ee379a121b10a6fcca9d1929fef