circle clock

Change-Id: Ic4bcc76c168db66c69f27af9da4883af4ecce125
superuser first place

Change-Id: I44ac0936a6dc469202ecfa15c7ab096c08fea535
Merge branch 'jellybean' into jellybean-legacy