jira: nojia Change-Id: I8ba2849afa07bc162a55b326c3d9a45150243ac3 (cherry picked from commit 96ba14c86d3cf180eeb585185d31bcb5d5db7415)
jira: nojia Change-Id: I8ba2849afa07bc162a55b326c3d9a45150243ac3 (cherry picked from commit 96ba14c86d3cf180eeb585185d31bcb5d5db7415)