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

Change-Id: I968178c63c2a92ab3cbee2b7cde21a96adb989bd