Merge "AppError: Change "close" to "close app"" into nyc-dev
am: b4cd4650cf

* commit 'b4cd4650cfd634df75e9e23f9585a756823bd012':
  AppError: Change "close" to "close app"

Change-Id: If2879efeaf2c3b4bd6112a22d81b59e32acbbc13