Merge "Fix mac build" am: a5c3e44663 am: f110ba8e99
am: 8603bc9ee9

* commit '8603bc9ee9777d4fb1b5b011d8bb208e02928034':
  Fix mac build