Patch Set 1: Looks good to me, but someone else must approve; IP review completed

I seperated this feature into his own change. I was previously added to change 825 (which is from now on dependent on this change).