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

Change-Id: Ib92f140990ed577483bcafdbdc87118f2528144e