[automerger skipped] [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag am: a299714c7a -s ours
am skip reason: subject contains skip directive

Change-Id: I1bef89dda2627f083794598b430701cdc62b22da