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

Change-Id: Ifd28024fc52f4d01f3fecc3c69a391135290ea04