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

Change-Id: I69f14b80e5f5818498cda013cb345c9b127422be