Merge "Use void instead of no parameters in 2 function declarations." am: 11b91e7c28 am: cbe556ee62
am: 2a064ca6e4

Change-Id: I8292eead31f078714d6a869f8f10409650ebc91f