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

Change-Id: I08d16238a82fc03a39c96922b7236a00cadccce1