Use storyboard for gertty

Change-Id: Ibe18922a0e24d93e14a51dfe42d499b1327d979e
Merge "Use storyboard for gertty"