Bring along the rest of the change too.

Change-Id: Ic1ca033e7f4003f7c7d10d3a47de00006f18fe02
1 file changed