Merge "Fix gts-media setup" am: cfca16010c
am: decfae56ae

Change-Id: I7d5909cedb584578409df58a5a46a692fc764644