Fix parsing error for handle

Change-Id: If5c324da38a104dccc1424d9cae7e07b2e4b7439
Merge "Fix parsing error for handle"