Merge "[DO NOT MERGE] Fix NPE caused by misplaced parenthesis." into nyc-dev am: 36a1cc6
am: 55fd06a

* commit '55fd06a7fde79daa0abf1f463926c2b34de3d80a':
  [DO NOT MERGE] Fix NPE caused by misplaced parenthesis.

Change-Id: I39a418ef9466e5b238192cfe598adf8da6aa2051