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

* commit '3e9c2b933a4f90419fed2b2f6aceee5c1303f6c4':

Change-Id: I635aa3ebf1af5ea9fe2a50734d28357c5ac3db97