[automerger skipped] Import translations. DO NOT MERGE am: ad9ed0173e  -s ours
am: 5fedab5c8d  -s ours

Change-Id: Ie008de22e830e25d3e6b224f3196ed9b2642283b