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

Change-Id: I97dfe2a83a8ffa46602b8bbb097fdbfe1e6b38b3