Misc changes from codeaurora