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

* commit 'd02a287e431ce95eb2f14177ca528e3cf61ecbc6':
  No input instead of disabling password entry