Merge "Allow setting read-only properties with value length > 92 characters" am: 96e8042e41
am: 5d40a3372f

Change-Id: I72a432b2e9ad06e0a3ed74f73bb6831b60c3b0ea