Merge changes from topics "ngran", "update_ngran" am: 226499214c
am: 1cf53ac4c3

Change-Id: If95698b75a660c55acb5ff26db25504bebbee3ec