Slim Bean Bring Up

Patch Set 2-5 : Whitespace + Backup files cleanup

Change-Id:   Ic351dde583b876a1648b62ad173332e166fcb3ed