Merge "Fixing call notifications for FBE" into nyc-dev
am: 27f6dbe2bb

* commit '27f6dbe2bb366a3b56227b8a7919f91c6ed8afcc':
  Fixing call notifications for FBE