fw/av remix-legacy branch

Change-Id: I0b47c2bed517c0481351fd6c94b7c4371d5118e1