Crespo4g: Last fixes for 4.3 bring up

Change-Id: I578c3c35ada7189800b9d98e558ce334a9e829ff