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

Change-Id: I17fb107cd6be736a43ca5acd38fc2b841dad0a70