The underlying CL was reverted. This reverts commit 564f5830. Change-Id: Ic9fe93a95c4357d0045a430713be7da517f626b5