Merge changes from topic "resampling for multiple pointers"
am: f1b536dbe3

Change-Id: I25521c84c58fa19cddd84707cc6b4324a1205fe8