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

Change-Id: I2617373cf49a5033ff02c4287fbe765fe63be516