Merge "Fix a bug where image apps were double-counted." into oc-mr1-dev
am: 5d340bce89

Change-Id: I0922506112f5ad943f827765c82b81a9287a52d7