[automerger skipped] [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag am: a299714c7a -s ours am: 3f20390b0e am: 2dc2124825 am: 72162540da

Change-Id: I4ea063ade8dd7f3c4bc077712595bc5dc52ed634