RC: I'm back

At least my mommy still loves me?

Change-Id: Ib706631178409ffd1fd0387e262d12d17a659ede