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

Change-Id: I33635b7ecd67c280fd0d143a77c4d350ac43cfff