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

Change-Id: If093400dfe80cd544df151fb8ee90878a9eecf51