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

Change-Id: I94e001e45f44f034414b969bba0cab4021ac56e3