[automerger skipped] Import translations. DO NOT MERGE am: 28d6f81665  -s ours
am: 231d627b11  -s ours

Change-Id: Ia6ad8c0eda1e1990ecd176c1aad6ce619496628a