[automerger skipped] Import translations. DO NOT MERGE am: f235730fea -s ours am: 4e697242d4 -s ours
am: 4442cc634d -s ours
am skip reason: subject contains skip directive

Change-Id: I69c1c14b9880e562a5eec9e5e89e88960a011211