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

Change-Id: Ifcfc1d0d0875b6b918bbb38c5077678584ef194c