Also: Add specific labels for capture-image-intent. Fixes: 20134921 Change-Id: I3678def1089512a8340f19110645a03379c26cee