Merge "Add cache for --binary filter in inject cmd."
am: 88b0c7f825

Change-Id: Ibdfe77b6e0695bfc1115a2fce63e77f4a1de5e56