Fix compile error.
Merge pull request #1526 from ey6es/master

Fix compile error.
Merge branch 'master' of https://github.com/worklist/hifi into armstrong