[automerger skipped] raw: accept any sample rate greater than 0 am: 4f74cca0...

[automerger skipped] raw: accept any sample rate greater than 0 am: 4f74cca0 -s ours am: 590a4e63 -s ours am: 9faabd74 -s ours am: 2aa9fe58 -s ours am: cf6e662b -s ours
am skip reason: Change-Id I2d47a05309031a735397838cca11bb4ffbf279e4 with SHA-1 4f74cca0 is in history

Change-Id: Ib61b5147b832a8379b3f00c2b567633834df36e8