[automerger skipped] Import translations. DO NOT MERGE skipped: 00778af1 skipped: 6640be88 am: f8331e66 -s ours am: 939062da -s ours Change-Id: I6a3739a14c41fc91a9831fd413cb44989dbd7f49