[automerger skipped] Merge "Import translations. DO NOT MERGE" am: c5032e2519 -s ours am: 0ab7319c8d -s ours
am: 63cb3ce774 -s ours
am skip reason: subject contains skip directive

Change-Id: I07ac12d68ed6843c6a00314a7274146e87e50a11