Merge "Prevent overflow in concealment clipping check" into pi-dev
am: b3ea08e059

Change-Id: I70d38eed9d6d6e52bcf00752c482ce92eddf6497