Merge "Fix resampling for multiple pointers" into oc-mr1-dev
am: c278874239  -s ours

Change-Id: Idfd0af7b4f2076331c6cc269f80980bfafd2445c