am fbec57d4: Merge changes Ib496e818,I074204e9

* commit 'fbec57d46c42460b2381484d1610ff21922d162e':
  bionic: add compatibility mode for properties
  bionic: use the size of the file to determine property area size