Merge "Add some media features" am: cae19d9a71
am: 3cb31fbb7b

Change-Id: Ie99e41ffff7df409f1c093dbeff183f4ea8dde9f