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

Change-Id: I1506365b43bee9ef79cba04364359f60f1fbfd28