Merge "Handle locale change and pacakge change in different way" into nyc-mr1-dev