Leftovers from delegate/springboard refactoring path Change-Id: I5557cae095a112a1e122a1edf7dac07d42feca4e
a22612eb94
8ceedbd375
a5098729ea