Merge "Allow ro. properties to have arbitrary lengths" am: 3851f132d1 am: 9fba6c2fe1 am: 918a29c88d
am: 3fb7276115

Change-Id: I7bc3e26d70267add40bfc2fb09b69b475e4daec6