[automerger skipped] Import translations. DO NOT MERGE am: 820137653b -s ours am: 1091821c66 -s ours
am: 3e4fd6ae9f -s ours
am skip reason: subject contains skip directive

Change-Id: Ide090eeae27a9ae513a17ab390d482b5ac3d95e5