Merge "Add rotation to configuration." into oc-dr1-dev
am: 2050dc66e2

Change-Id: I585507c98972c7b8a2ad07e21bf56c13552d20a4