Merge branch 'upstream' into tizen 26/35426/1 accepted/tizen_3.0.2014.q4_common accepted/tizen_3.0_common accepted/tizen_3.0_ivi accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_unified accepted/tizen_wearable tizen tizen_3.0 tizen_3.0.2014.q4_common tizen_3.0.2015.q1_common tizen_3.0.2015.q2_common tizen_3.0.m1_mobile tizen_3.0.m1_tv tizen_3.0.m2 accepted/tizen/3.0.2014.q4/common/20150226.105903 accepted/tizen/3.0/common/20161114.110626 accepted/tizen/3.0/ivi/20161011.044020 accepted/tizen/common/20150216.085155 accepted/tizen/ivi/20160218.024728 accepted/tizen/mobile/20150216.094051 accepted/tizen/tv/20150216.093207 accepted/tizen/unified/20170309.035250 accepted/tizen/wearable/20150216.093746 submit/tizen/20150213.150700 submit/tizen_3.0.2014.q4_common/20150226.000000 submit/tizen_3.0.m2/20170104.093752 submit/tizen_3.0_common/20161104.104000 submit/tizen_3.0_ivi/20161010.000002 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000005 submit/tizen_unified/20170308.100412 tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release tizen_4.0.m1_release