[automerger skipped] Import translations. DO NOT MERGE am: 07808d1477 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibceea9fa6d6caa6cdd23d14caa734e128684503d