Merge "System API annotation and API .txt changes"