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

Change-Id: I325c17c2c8f204280bff71928f0148e13c6a864e