Merge "Fix Bug1029936 :SKIP TEST removal and change of Bug ID"