[automerger skipped] Import translations. DO NOT MERGE
am: 8a83fcf4f7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic800cbef31c5c89f45e31043b0981d81db308624