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

Change-Id: I9f54cfffc23c2e9bf83bd351a317f81230c3f222