[automerger skipped] Import translations. DO NOT MERGE am: d0b006d0c3  -s ours
am: f3e5538d6e  -s ours

Change-Id: Ibff37b3821d3431660d44cfc22c0d574a80a5a35