am a70e0312: am a6322b85: am 257944d6: Merge "Don\'t Test Zoom Controls" into ics-mr1

* commit 'a70e03125d173b5f29f0d9a42b9c8e75508897fc':
  Don't Test Zoom Controls