Merge "Use correct type for GetValueFromShadowFrame" am: c36a970fcd am: d70097de7f
am: d16113bce8

Change-Id: Ic6ee42d0ff3611d1537ccb8699d80740667e70c1