Bug fixes.

Change-Id: Ieccbda7c6aa52c355b1c72c3216bafaaff2c9be8
Remove pdb

Change-Id: If49703ee2196b24a165c095d781262601de0f460