AID-218 Update to latest amedia-properties to fix tests.
Merge remote-tracking branch 'origin/master'