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

Change-Id: Id6570217d27846113e71a717369513f5e386b836