Merge "Fix unmount up button" into nyc-dev
am: 7680871d92

* commit '7680871d92cd9fa31a3f515d112767644745f26e':
  Fix unmount up button

Change-Id: I4c803b0664abd85956b724b782820920dced6a31