[automerger skipped] Import translations. DO NOT MERGE am: 0f3bf10aba -s ours
am: df3c0f0a48 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaae014997605e4c4101e3e87847c9cf2d9c6e577