DO NOT MERGE A set of bugfixes in media components
am: 824c55e512

Change-Id: I9ab2646ca6ebba965bb0bd422b04a7337e46ea0c