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

Change-Id: I9f042c269caa25c2824e62e06e4fb775124310b7