Merge "Stop 1 sec updates of ECBM Notification" am: 3c077abe48 am: 250da0f683 am: e208ea06da  -s ours
am: 308ee4eb2a  -s ours

Change-Id: I022c1150fd3a14d33ec6ce785768f4e390d9c3d2