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

Change-Id: I6931f8b42325661d01f6a58c969bb571675038f1