am 62b532c7: am d2d8c553: am e91c37de: Fixes wrongly nested braces. Bug: 17499985 automerge: cc7917d automerge: 4fc0aac
automerge: ae4297e

* commit 'ae4297e2ef5e0713ecf78112b57b97444f20c818':
  Fixes wrongly nested braces. Bug: 17499985