Fix Themes patch merge - Doc's fail

Change-Id: If853cd7b731d163a84168169d28a2351678b76d8