[automerger skipped] Import translations. DO NOT MERGE am: cb0ab7b18e -s ours am: 9682d0e39d -s ours

am skip reason: subject contains skip directive

Change-Id: Id9923e959c326f37bae781ae79b74c380c2b9364