Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev am: 85c10342c1
am: 52e87790d2

Change-Id: Idfa9d861b28436e8be60e80da50be3c2f18acca7