[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 15ae4ea8e2 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifeaf67de45c1d064b1abaee04e27590dfdbb2843