Merge "Fixed an NPE in the RegionSamplingHelper" into qt-dev
am: c821a52062

Change-Id: I3e48b4c618d7b9746c8ec9429ec5d6a24d0bec26