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

Change-Id: Ibc5abd3cb3457ecdf80806cf47c21ff7ba3267c8