Merge "Make sure theme attributes don't get lost" into oc-dev am: 9d2f03ec5d
am: 5cf511907d

Change-Id: If65a78ae543335a9f3689e92665cca00e1fd5efd