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

Change-Id: I31e66d978b13b9d45917b96bfdbc4a99b942f104