[automerger skipped] [DO NOT MERGE] Turn off FOLDER_NAME_SUGGEST feature flag am: a299714c7a -s ours am: 3f20390b0e am: 2dc2124825 am: 72162540da am: 0f5300d77b -s ours
am skip reason: subject contains skip directive

Change-Id: Iaf2037e0d29dcb075eb89bf39b786fd8e504a70b