Added handle to fix the bug. (cherry picked from commit b89a8c66) Bug: 21638351 Change-Id: I1c3abea33aa825d3a28c1fc5cb415508686ad93e