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

Change-Id: Ic09a5d171b5ddfb5a4de172e995c7a2c33d1b344