[automerger skipped] Import translations. DO NOT MERGE
am: 325875392c -s ours
am skip reason: subject contains skip directive

Change-Id: I31fb6719396c50effb20c8e2516ca109a9b0de47