[automerger skipped] Merge changes from topic "resampling for multiple pointers" am: f1b536dbe3
am: b004c97df9  -s ours

Change-Id: Ib3e4189f58355c922d1a137fce2815c9425ef438