[automerger skipped] Import translations. DO NOT MERGE am: b54c147e27 -s ours am: e6e37fc9e2 -s ours

am skip reason: subject contains skip directive

Change-Id: Ic5b9e469d06d104acf3113efdd8a76babd9c73d3