Merge changes from topic "libsparse-callback"
am: 49b7f296b9

Change-Id: I106758e1ba319e0b2f1a912fe383f5ab5752ee2f