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