Add agnosticbin fixes

Change-Id: Id795371f22f97bdfcf467f5a8c5c71e17a80a6bb