[automerger skipped] [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag am: a299714c7a -s ours am: 3f20390b0e am: 73ae860825 am: f13bb8722c

Change-Id: I57b3bb907a875ebe50c9eb4bdcefef6c59207d07