Merge changes from topic \\'seamless-rotation\\' into nyc-mr1-dev am: 4bfbe1f7ef
am: d99daf4fe6

Change-Id: Iaabf524a3b835b794b2b1269cd573b66676be9a1