Merge "itm and mdsal porting"