some minor cleanups to wrapped classes

Change-Id: I6778b6116f403c16351e4a29e06a9f426c746993
Merge topic 'minor_cleanup' into master

38b02c3e some minor cleanups to wrapped classes