Fix build. This reverts commit 4f115e08cb. Change-Id: Ic4f51e3492f54afec5f0eeb48e08491eb47f3c04
4f115e08cb
9d98a089