[automerger skipped] Import translations. DO NOT MERGE
am: b251eda396  -s ours

Change-Id: Idf1027330f47b5ed6eeb22c3e9d81f975d655c57