Merge "Don\'t enable new folder in downloads..." into nyc-dev
am: eb76763

* commit 'eb76763b80ea9bafbc8792db6f5e59ff98e4ef33':
  Don't enable new folder in downloads...

Change-Id: Iae81b70fe2556ecc5c68c01f2f08d77db199fb9a