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

Change-Id: Icf0a7ad1de5e755c94739d2cd94f2d1fcc32b54e