[automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4
am: cbaf1505a0  -s ours

Change-Id: I362c59a89efba73b45a9a5d81474cac8448c2f84