[automerger skipped] Merge "Divide BBOX_TRANSFORM into 2 ops." am: 76c45692bf am: c99b272310
am: 819bca4bf5  -s ours

Change-Id: I2c7e6c566550973d6bfad0b69ad5375fdf9d2b87