[automerger skipped] Import translations. DO NOT MERGE am: 544bb1dae9 -s ours
am: 5ea02a0bf5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib9a6f8932bed376ff3ed70bb06f748dabff2b9e9