Fix handling of '0' value in API response

Change-Id: I7a284460327ddd2891fcdf45643001c3e1f2f356