[automerger skipped] Import translations. DO NOT MERGE am: 5ce016b525  -s ours
am: d919c12ad0  -s ours

Change-Id: Ie5839c7c0e9ea243b858a3df611ea4ce42fcd1d4