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

* commit '5dd7e55b337bc55c5e0794028db80dafc90007cb':

Change-Id: I099552ec42c86c6349938a9164c89e374020e9e6