Fixed build breakage This reverts commit d35dcb1311. Change-Id: Id3a103fbaac15a05f558bce2161ce17b6e8d2ea3
d35dcb1311