[automerger skipped] Import translations. DO NOT MERGE
am: aa9ba6306a  -s ours

Change-Id: Id29ec5039cffe1fe3165e1eacc383a539fcce9e8