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

Change-Id: Ic808bd75178dbfe9b48d5a7c1d67f739d9ef0e76