Merge changes from topic "zip_and_sparse"
am: f1d9e1ffc6

Change-Id: I9f6bdcfa6202aec4889619d91fc0eaeedd6bbb6b