This fixes a regression introduced in the CL for bug 21789313. Change-Id: Ic7829d9a33356261c562c814f0873bb352f0655b