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

Change-Id: I2bf6c51cfcf0d0e01f530ccaec5feb9de0c5d293