Merge "API Documentation and Constant cleanup."
am: 8882c55b21

Change-Id: I9b29ba9beb91005dfd0df267d9ca21b0e858abad