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