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

Change-Id: I8b932c6210f42d80d74d4783cca2a9256a58ba45