Fix negative number issue

Change-Id: I4bcc4c0a2022b9d742089b238c3f3aaaf7a6f4a9
Merge "Fix negative number issue"