[automerger skipped] Import translations. DO NOT MERGE am: 3a8f890430 -s ours
am: 5539ecdfa5 -s ours
am skip reason: subject contains skip directive

Change-Id: I3635f085607f771a075502044e402db0238b08a2