Merge "API Documentation and Constant cleanup." into pi-dev
am: b6956c92bc

Change-Id: I16143955ced1091c89076e2c0dd2a6ad1198c673