util: Do not insert uninitialized data if Android property is not set

extracting already reviewed fix from !7861 (merged)

@MarijnS95 I'm extracting this one out from your MR so we don't have to wait to land it.. hope you don't mind.