[automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ours am: f9c445788b -s ours
am: 8563a2027a -s ours
am skip reason: subject contains skip directive

Change-Id: Icad87bed014583309c3a48e88107bd970b0064df