[automerger skipped] Import translations. DO NOT MERGE am: a9ee39f5cb -s ours am: 20b7d15ae5 -s ours
am: bfe418d5ef -s ours
am skip reason: subject contains skip directive

Change-Id: Ia68307ad98a2e2b413c785c57b179560b9f6cfe7