[automerger skipped] [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag am: a299714c7a -s ours am: 3f20390b0e am: 73ae860825 am: f13bb8722c am: d9329d8680 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d88f5c4ca8193a5ef565179ab50746c3963bf67