Merge "Divide BBOX_TRANSFORM into 2 ops."
am: 76c45692bf

Change-Id: Ic45409f36b1084c32c14ec708cda52b9c760865e