Merge changes from topic "zip_and_sparse" am: f1d9e1ffc6
am: 2989d23283

Change-Id: Iefb6867f20734d6faa90f7b8eee66bb42a5ac15b