Replace hack with new framework support

Change-Id: I62abc855fd4db18e17415c86e9b791b1710abd2f
1 file changed