Merge "Fix invalid divider state while rotating" into nyc-mr1-dev
am: a2316b3041

Change-Id: Iacaaae092285b09290a99a009a86b81434031dae