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

I was able to install this and I12eba86bfbe584560c213882ebba58bf1f9fa0c1 into 3.4.2. But don't submit before the change I12eba86bfbe584560c213882ebba58bf1f9fa0c1