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

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

Change-Id: I77695c15c0c684a2e14709a14811975f2d81da7c