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

Change-Id: Ibc81421ad93611b8708f3f6c599848cb45fe90bf