[automerger skipped] Import translations. DO NOT MERGE skipped: 0ea56e1f skipped: 2ddbc2a9 am: eea95afb -s ours am: b018fd86 -s ours Change-Id: I2ad231b56e77ea947e38843df4b368122f00c9ed