[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807 am: 5e3def3f70  -s ours am: 599b561ff1  -s ours am: 4aa205acf7  -s ours
am: 850ef7e641  -s ours

Change-Id: I34933587af623806db9ef947a9a39e9fba913933