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

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

Change-Id: I3e595a732f56311be3d717b0f52c8fdf3b017e61