[automerger skipped] Import translations. DO NOT MERGE am: 96caa8600b  -s ours
am: ce794a50b9  -s ours

Change-Id: I7ed7db9f0f1fb2fc4f23ccf47742ed0b4d24e5be