Import translations. DO NOT MERGE am: 18a114896c  -s ours am: d79cff78c7  -s ours
am: de9f8fbc91  -s ours

Change-Id: I6ef69ba1f16d24cfa93de64e91276b96c612d51f