Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev