Merge "Updated with Tizen:Base source codes"