Translate to master

Change-Id: Icc8d66a3631de45f1f62e5be95af981507db9fef