Guess who is back

Change-Id: Idd7552307a79e1c1056ab648db0a1c6f91bd6556
Guess who is back part 2

Change-Id: Ib26b6a7c045b4b08b0ee3fe9093185a89229271f