am cf0a1138: am 950c6250: am 5138958c: Merge "Enable property expansion for insmod"

* commit 'cf0a11381129c73fe2084cc1e04da74585eabaa6':
  Enable property expansion for insmod