am 48bebaec: am 4efbf95d: Merge "Use proper variable typing"

* commit '48bebaeca84cd9014171d2874785ddb57d1103ae':
  Use proper variable typing