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

Change-Id: I76943ca6e6c4541924c34ce6e7da5bf95676abec