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

Change-Id: If7807fcc8b33f9a404c25ea53917462b3a320a32