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

Change-Id: I9ba3b48dc147dbb007a90a16e304a995195d56ba