Merge branch 'sandbox/jh0822kim/avoid_rebuilds' into tizen