Fix merge

Change-Id: I80893d1be6a5ae133e0795c8f678b105e94f22eb
Fix merge

Change-Id: I4dcc95963dae73add9c64585aa449b0b62f9a36b
Build fixes (Still not ready)

Change-Id: I0e9b15ed8833223bf66aeaa7171a4903d1bef6d7
Merge remote-tracking branch 'frameworksPA/jb43' into jb43