Merge "Merge "Add shadow and wrapper classes" into oc-dr1-dev am: 0782535daf
am: 26e7518f76
-s ours" into oc-mr1-dev-plus-aosp
am: c96e9fc57d
-s ours
Change-Id: I944d6ddac022e0e4e9a117f5552732df1f916f45
This commit is contained in: