Merge "Add function to parse hex String to int" am: edc447fc2a am: 6c4390a3a4
am: 0662c0b7b0

Change-Id: Ib094ddaec1019deef07a4527aa223501bb3885a4