This reverts commit be714f6fa3. Reason for revert: build breakage Change-Id: I02a16de23cd657bc0cc9494b03f840d0060ac9d1
be714f6fa3