am b2331bc7: am 99b3089d: Merge "Update after moving the code to Catapult"

* commit 'b2331bc7fbd6cc9e0d40325c0ff8a41eb85b8c89':
  Update after moving the code to Catapult