[automerger skipped] Import translations. DO NOT MERGE am: 21caa6f1d3 -s ours am: 77aeea8219 -s ours
am: 3f10c6ec94 -s ours
am skip reason: subject contains skip directive

Change-Id: Idd631a7f20b335cbad73310fa4673083a86f6608