[automerger skipped] Import translations. DO NOT MERGE am: 2a50dac763 -s ours am: 687d31acc9 -s ours
am skip reason: subject contains skip directive

Change-Id: If0808f7f35bd0e427942c3d0289a404d7b0ec86c