Merge "Fix crash when docking." into nyc-dev
am: 45ee78c

* commit '45ee78c083906eca68cdade9bc98b64a83372307':
  Fix crash when docking.

Change-Id: Ic2de9854c107886f45024eb4bc620b07b1329a20