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

* commit '4fc0aacb1add76df5fde2c9b24f96f8bc3e9dc1d':
  Fixes wrongly nested braces. Bug: 17499985