Merge \"Loading NanoApps now works.\" into nyc-mr1-dev
am: 095979b463

Change-Id: I8035e04cc0ca040357a8799136c9b31702a151c0