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

Change-Id: I35f222aa1ff6d1fb74d9f4a201229cced8e40d98