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

Change-Id: Ibc5d44dec6ac1fd849d64ab46aeffca4c769bc61