Merging mobilesdk back to mobilesdk.unstable