Merge "Correctly handle a case when there are no preloaded apps" into nyc-mr1-dev