Merge "Use correct type for GetValueFromShadowFrame" into oc-dev am: 7ff1ef220c
am: 4a03b40132

Change-Id: I3edfd5c4a0f1337daf167c0e29f9ac2532036a76