Cross port Ovi changes to Nokia from Pull Request #237 via @esohns-humana.