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

Change-Id: I4d4aa6450ea37563806860d6965a146301231a1a