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

Change-Id: I17e82e916a2ab8a5cfe4c86208c47909160a4f4b