Merge "Fix continuous build"
am: e597d59771

* commit 'e597d59771ac85a18744587eebc8711286aae5d4':
  Fix continuous build