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

* commit 'b55f69ff32f0b833de39d3e4a399cfb9973792bf':
  Fix empty account labels in airplane mode

Change-Id: Ibb8423827958efcb30c7fe230ae96a80e4b7b995