Merge "Add shadow and wrapper classes" into oc-dr1-dev
am: 0782535daf  -s ours

Change-Id: Ic4e422d73f822b6f0a11ad624bd67e79ac1b9d73