[automerger skipped] Import translations. DO NOT MERGE
am: 6b16bed46b  -s ours

Change-Id: I548414bd21bb74537ce4b152a2ef40627d9a53b4