Also includes b/3500025: A/V resync issues Change-Id: Ib885d7219d211b188f38e9427bdaecd10fbd7329
Change-Id: Ic11ed7ad57717e88b6f0f2991d8bbb9e1251d546
Change-Id: I2b43e90c279391436f1bbb18ebd64961bec4f9ee