[automerger skipped] Import translations. DO NOT MERGE am: 1126d505a0 -s ours
am: 9bfc3b68b3 -s ours
am skip reason: subject contains skip directive

Change-Id: Iac1594567bf9a25ad8ba30bd8c0bb2e6cbfec825