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

Change-Id: I7b83d217925af84ddd2ec63002dfe479913127ff