Merge "Optimized Code: call direct method to get integer extra" am: b7fa46453a
am: 7e51242c05

Change-Id: Ide77fb0f05a8eeb2df4ab24dc1831cd734c95362