Merge "API Documentation and Constant cleanup." am: 8882c55b21 am: 8917fc21cc
am: 168a77237f

Change-Id: I7860fcd813f25adaaccf632f2c61dd4138a0a889