Merge changes Ib496e818,I074204e9 * changes: bionic: add compatibility mode for properties bionic: use the size of the file to determine property area size