Translate to master

Change-Id: Ie48af3ed8a1ba6c542bb7ce500fe41d4c49a8014