Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf am: 62eb79e6c8" into nyc-mr1-dev-plus-aosp