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

Change-Id: If5d743e04b7acd81e45fd0727db7fd25b75c7ce9