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

Change-Id: I1ae0766da45a61c777f7772193171180f15c9ecb