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

Change-Id: Ieddaa832f55b0414da39936c058b95c31d7b3aca