[automerger skipped] Import translations. DO NOT MERGE am: e2f5f9b876
-s ours
am: f85844d8e6
-s ours
am skip reason: subject contains skip directive
Change-Id: I4a78368e63d392970943461484cb996bb9604167
This commit is contained in: