First integration with bundler

Change-Id: I5999626e0a9417b8ed1478ad824449bbf20d0527