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

Change-Id: Ibab12d2b53d7e4072f6f3f42aa643b4113daf08e