Merge proposals dependent on lp://staging/~ci-train-bot/indicator-transfer/indicator-transfer-ubuntu-zesty-2129

1. indicator-transfer-ubuntu-zesty-2129
2. Dependent merge proposals