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

Change-Id: Id4638c9126cce687bb4513731be2aeb962b2250d