[automerger skipped] Import translations. DO NOT MERGE am: a3945ace06  -s ours
am: 81ebfc39e3  -s ours

Change-Id: I4032a93505ca5248f61dd7c9df9e85c556b15eb9