Merge "Don't generate stack in logcat if assistant missing." into nyc-dev