[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720 am: c6d9bee144  -s ours
am: bf6bbefe57  -s ours

Change-Id: Ife52c79c0b85d9f09f1d2cf7b792239aaae24868