Merge "Checking unsigned variable less than zero" am: 0d264bf088
am: 957f6491f8

Change-Id: If9516fdbb4798675330cc3accdc299445e64e258