fix EMBPD00157459
Merge branch '5-0-sp2-stable' of github.com:rhomobile/rhodes into 5-0-sp2-stable