Merge "Fix empty account labels in airplane mode" into nyc-dev am: b55f69f
am: 18e2d73

* commit '18e2d73e3c0477da7d4a7521e80565c7ad1f8a44':
  Fix empty account labels in airplane mode

Change-Id: I0f77419c919990918b126b7b5871bb4b2fbf323f