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

Change-Id: Icfdaf31ebdfc8a704121e8084565008efb58aa6e