am 5138958c: Merge "Enable property expansion for insmod"

* commit '5138958cb30266e718cd523905037e7e95373271':
  Enable property expansion for insmod