Merge "Fixing PLM issue P130403-7529" into tizen_2.1