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

* commit 'b2969709a0ff2ae24f27aaeba961b42c089e306b':
  Fix continuous build