Merge "Block write access to media for non-owners." into qt-dev
am: 296152392f

Change-Id: I10200aa662b39b936ce19a09d4c4abf8eade5f06