Merge "Check the media.settings.xml property" am: 646a332acf am: 5369de1fd6 am: 7a0e398867 am: 870e351f6a
am: 2ab28960d7

Change-Id: Iae0f2b9ab1415e75b8b9dff9ec473c2fbe61ee61