[automerger skipped] Import translations. DO NOT MERGE am: 9ad5eddc47  -s ours
am: 7b03f35120  -s ours

Change-Id: I3743ddac56b56159c836e74ffcce4744aff10d7e