and

coverity#706114 Unintended sign extension
coverity#706113 Unintended sign extension

Change-Id: Ib9ab82082fb353ecfc98a4130fdf2bb136ac1350