[automerger skipped] Merge changes from topics "ngran", "update_ngran" am: ca0e5aa890 am: 16be1378f6
am: 4743af25e5 -s ours
am skip reason: change_id I7b59cd52dffdccc30b536a0bef9cab5ad977d371 with SHA1 dbb5f9d745 is in history

Change-Id: I7bb245126b83ad92760199ba665a8ddd8c7fd2ee