zhangbo 568eadccd4 resolve some merge 5 gadi atpakaļ
..
linux-arm-static 568eadccd4 resolve some merge 5 gadi atpakaļ