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

Change-Id: I164421a52add13fb78423ae92493ce9c10a58f03