[automerger skipped] Import translations. DO NOT MERGE skipped: f40a0a8dae skipped: 110074be1a am: 77b862002b  -s ours
am: 4c4783d520  -s ours

Change-Id: Iedf2cfa122c27e68007cbeb10a07a5f8d98ecc31