Adding embed support

Change-Id: I34d9744cd21bb377b2d39fd4f76b5f58e378c233