Merge upgrade commit (v1.0.2e) into tizen_base