[automerger] Revert "Update Folders to match spec." am: 9ad87463a8

Change-Id: I75ad19eba41a0bab0461a0255954092a4790c617