[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 2f0bcbd3dc -s ours am: ce93a7756a -s ours

am skip reason: subject contains skip directive

Change-Id: If8fce843022b67fd156fccafdbb93b961e7baff0