The heavy lifting was done by clazy.

Change-Id: I8a36528605e5de791ece191e94a0911112b5a237
Reviewed-by: Orgad Shaneh <orgads@gmail.com>