am b441a2b9: Merge 821678e1

* commit 'b441a2b930b5a85ea0189fbb99618823bf560037':
  init: Increase maximum number of Android properties to 372