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

Change-Id: Ib195a8efb15dcde094c0169716845381ab4fa5a9