Updates Tuesday before demo

Change-Id: Id5aa9814098e9793d6a6e334f22982eccec4e6fc