Reapply fix after bad merge.

Bug 13745751

Change-Id: I8eda37bd0e083b7c7949935973330882f6f5f1dc
1 file changed