[automerger skipped] Import translations. DO NOT MERGE skipped: 8c8bc9be80 skipped: 2edfa5fe9e
am: 2ff848a964  -s ours

Change-Id: I0a832e1ac966550bc914ee1455a574a39e947922