Merge "Maybe decrypt user when quiet mode is disabled" into nyc-dev
am: 2f4c229

* commit '2f4c2299c7ef4b9d604b9833c790a7afd2ed75af':
  Maybe decrypt user when quiet mode is disabled

Change-Id: I0d84934a978205c283b846b7412446a064aac01c