[automerger skipped] Import translations. DO NOT MERGE am: 90b3dabe5c -s ours
am: 9657a5717a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic6c6ca505c75f07524cb726e361ae51e09ae1e0b