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

Change-Id: If5efe54282b0e4003a5b5e79ea474d093463613d