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