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

Change-Id: I22c56a497daf3c46d749c53cac84843002082bf8