Merge "Upgrade OpenCSD to v0.11.2"
am: 7a88414d01

Change-Id: I1d58e8633aa6f81debfe69c1e10dd2621b06b790