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

* commit 'e5e5b4f6b7f77fdfaf231713e6c613c8162794cc':
  Fixing call notifications for FBE