Merge "Specify argument types for function prototype" am: 83c7d04493

Change-Id: I8b3c72616dd1cebfa4d34553fd7307cf48837fbb