Cleanup in preperation for release.

Change-Id: Iaeb926b929d4f8210ebbfa310134b1fb50dce276
Merge "Cleanup in preperation for release."