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: Ib20f930f8ab801ba1d1d8b965e380329988086eb