[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae skipped: 39c48a1168
am: a05627322f  -s ours

Change-Id: I8b0805714082f83552ebb6cbd8290bcd0c39d6cd