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

Change-Id: If608d57f32a84ca3e715182d09e535fc886c26bb