[automerger skipped] Import translations. DO NOT MERGE am: 73915b77ed -s ours am: 99f04da5dc -s ours
am: 66d00b68c6 -s ours
am skip reason: subject contains skip directive

Change-Id: I0eded95e9433b1779cecc3016fe880e9b567465b