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

Change-Id: I2b86e10a1e6d700ebaeb25e7a8086c840c5f5b10