Fixes bug 2502132, and masks bug 2518313.

Change-Id: I5c5ecf1c10763f7b3f3d1e5c57dc5ce77cc344fd
1 file changed