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

Change-Id: Ie6724ee7e792afb3f1548724e011446812174211