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

Change-Id: I27e0fa60babc440549079f3aaec0955b4ae0883f