fix calculation error for ',' as decimal point

Change-Id: Ie09e87daec0ad9d576e1a2b181b16e94cb18fbda
Merge branch 'cm' into HEAD