[automerger skipped] Import translations. DO NOT MERGE am: aa605a2ff8 -s ours am: 165a3e6152 -s ours
am: 8491c7fc2b -s ours
am skip reason: subject contains skip directive

Change-Id: Ied4ddf5cfdea7c3c6b402d7f57ea3e393ded01a3