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

Change-Id: I3abee8510e9d436487de938c6d395d89e7d298df