Fix bounds rotation logic
am: 781240d9bb

Change-Id: I64a81112b8384a3281cde20bf0f4a6e1628d746c