Merge "Modify shouldProcessCall API to remove redundancy" am: 59391aa4a0
am: 8f2c2ca09a

Change-Id: Id4762516cce2f6f902542d0b15195e9531c2eda4