Merge remote-tracking branch 'remotes/gitomapzoom/p-ti-android-3.8.y' into p-ti-andro...