am a96bca9a: am 11c9cd45: Merge "Fix build"

* commit 'a96bca9abb7f31591af69c0cba08638bdf48dd79':
  Fix build