Merge "Update string description and char limits" into oc-dev am: 3151a09dac
am: 5e56569cdf

Change-Id: I2a2dc3574fdad77c7aac0f38736d9f2fdf7b3805