[automerger skipped] Import translations. DO NOT MERGE skipped: aa7eca2f03 skipped: ccc16f92d7

Change-Id: Ibe748c9da6143a7a0421edd05f91209e2513434f