Merge "[automerger skipped] Import translations. DO NOT MERGE am: 3c7cd66c75 -s ours am: ce1184da3f -s ours
am: 9d9d405713 -s ours
am skip reason: subject contains skip directive

Change-Id: I7b1da3ed586c186f7ab2b5efaf2730d1716e5675