Merge "remove return on void function" into tizen_2.2