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

Change-Id: I709853bf86a03655f6dcbb9c2056a961f55c34cd