Merge "Only allow UTF8 encoded property values" am: 4ff2607ef7 am: 9c767212eb am: fccffc8645
am: 486dc4a497

Change-Id: Id30671ac9b6f15711fe9e5bc54e37c5274a1fbce