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

Change-Id: I576f662f1d0f0f7eecea9d39d71954c95d2aa41c