Merge "Ignore audio sync sample list" am: f9ac0e84e2 am: 34dec945e6
am: ee3eb46566

Change-Id: I97d4f6c2d2eb3dac74626cfd9edc1831b38cee37