[Panlingual] Fix conflict

 - sync code from master to tm-dev

Change-Id: I75b66cd2fa161a6e7c8a9d272b67516ac55e7025
1 file changed