Merge "Don't attempt to convert degree to orientation enum twice" am: 1eecb545d0 am: 968387c97d

Change-Id: I07588aead266d4c5862711c20bdf13e1e5cdc82e