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

Change-Id: Ic9f7ba34e2b434bff64d271027f3f1f0f12b056f