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

Change-Id: Id878fe72749092d383eb72db8c9ff750de0a2ee5