Merge changes from topics "ngran", "update_ngran"
am: ca0e5aa890

Change-Id: I44974f5e2ff63fe7bd4a0a417ce92bbd287b103c