Commotio staging - Day 1

Change-Id: I7a8fa357cab4add68bc6297bddd37122bf3d9b27