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

Change-Id: Ia544ad7042b81ed41d46fdd41837cf87f22095b6