[automerger skipped] Import translations. DO NOT MERGE skipped: 52ebdfd973 skipped: c400b6da60
am: fa863f597e  -s ours

Change-Id: I65d675e10fff69c1b45b8bb07a1acb1bcff17dbd