[automerger skipped] Import translations. DO NOT MERGE am: 3447b7b66c -s ours
am: 0079161fcd -s ours
am skip reason: subject contains skip directive

Change-Id: Ieaca9606d48147c73b59e3a8cbf0d1a2487bdfdf