Unity

Merge proposals dependent on lp://qastaging/~nicovdw/unity/updated-fix-for-731212

  1. updated-fix-for-731212
  2. Dependent merge proposals

lp://qastaging/~nicovdw/unity/updated-fix-for-731212 has no merge proposals.