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

Change-Id: I1bbffc4f9582d106ce28ac07e6c6719c9f8f063d