[automerger skipped] Import translations. DO NOT MERGE am: bf08c64c12 -s ours am: 2ca7df7a90 -s ours

am skip reason: subject contains skip directive

Change-Id: Iab28bb6ccd3add82f1c924569b09c7f9567d138b