[automerger skipped] Import translations. DO NOT MERGE am: 1091598c0e -s ours am: d8cd6b7312 -s ours
am: 3b9523e8e8 -s ours
am skip reason: subject contains skip directive

Change-Id: I1ea31f2a6f832b910a361c99e3c916ce0c3f8913