Merge "Increase CHAR LIMIT" into oc-dr1-dev
am: cd2cb4511a

Change-Id: I96a2e76f42d2972eaa2542c7d4d94a728c48ead2