A few fixes for RotationResolver

This is a follow-up change of ag/13056186 to resolve some of the
comments.

Bug: 178405054
Test: unit tests
Change-Id: I04015b432b9bac96561e779cc4aa76155e6168e9
6 files changed