Merge "Fix continuous build" am: e597d59771
am: 475dea46d7

* commit '475dea46d7fe5706cae4d55a17038421f737ef65':
  Fix continuous build