am 1cb3e814: Merge "Fix sdk build"

* commit '1cb3e81421ada146b35515942299fb867b82048d':
  Fix sdk build