DO NOT MERGE Only throw exception in EBT helper if parent bounds are untouched
am: 2521705  -s ours

* commit '25217058fefeff6aa4185b8abda1510480ee58be':
  DO NOT MERGE Only throw exception in EBT helper if parent bounds are untouched

Change-Id: Ia14865da76c3ade3ac7b724cce2cb8ebc7676bea