am 00d1fcf7: Merge "No input instead of disabling password entry" into mnc-dev

* commit '00d1fcf7372155510930a2ea759d08bf8db93b61':
  No input instead of disabling password entry