am 971003c9: am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach"

* commit '971003c9ffc854f4b080af902457e7a6447f692a':
  Re-initialize error after attach