Merge "Fix Broken Build" into gingerbread