[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 15ae4ea8e2 -s ours am: b84ad0d8f8 -s ours am: b1f6ae1b6f -s ours

am skip reason: subject contains skip directive

Change-Id: Ie54cba6875df3cc249761690ebfcf17bbb359006