Includes a cherry-pick of: r213309 - fixes umodsi3 Change-Id: Ic7367e3586b6af7ef74bee6a8cf437d5f28d975a