Timob 12610

Documentation updates. CR but don't merge just yet. There will probably require changes and updates for Android.