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

Change-Id: Id3b6af3b66959fb2d8311a7bad646c52ae4b4fe7