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

Change-Id: I1a59b2e53dd83ef3630a6677e75e15b651481493