Merge "Use correct type for GetValueFromShadowFrame"
am: c36a970fcd

Change-Id: I7ae578e671658c4790aaaf67aac22adfded9b5df