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

Change-Id: I9fa3e11efad8d7d6bc32ea4729914114bd96d108