Merge "Merge "Fixed an NPE in the RegionSamplingHelper" into qt-dev am:...
Merge "Merge "Fixed an NPE in the RegionSamplingHelper" into qt-dev am: c821a520 am: 1b179a6e" into qt-r1-dev-plus-aosp
am: 33f71014
Change-Id: Ie70e3030240def5396a01969da4a3c2798f3daa1