[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 20add0a4c6  -s ours
am: ebccff42db  -s ours

Change-Id: Ifaa93b8cbfe1791408980d66fdfc191d3e840e27