Merge "Stop 1 sec updates of ECBM Notification" am: 3c077abe48
am: 250da0f683

Change-Id: I26aa16f3db9684326068014ff86e8436d809ac66