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

Change-Id: I88f40eb04e70785c381004b4e50f0b83c70adc23