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

Change-Id: I45e39dbfa1b29e4d7384dc5fcf982b8d8d607a50