[automerger skipped] Merge changes from topics "ngran", "update_ngran" am: 226499214c am: 1cf53ac4c3
am: 47eee1eb10 -s ours
am skip reason: change_id I4b83b244caa9a168d1afbc99a32ae84bc41346d1 with SHA1 dd1afd657a is in history

Change-Id: Iea59b34712eed6e9c19f8565da43029986fa0d43