Merge "Revert "Force client composition if we'd use rotator"" into pi-dev am: 88ec27588b
am: 11c79b028c

Change-Id: Iba3c5486facc9889f0736587886418835e4e4204