Merge "NanoApp: Make indentation consistent" into nyc-dev
am: 7c0393a

* commit '7c0393abdf121aca271f870d492def5b329b6360':
  NanoApp: Make indentation consistent

Change-Id: Ib1cdcfc2fe61266d4fcac44739f9273737108f56