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

Change-Id: If76998a592b351e7c0884a674fb770ae039b2db8