Merge "Fix the ECBM dialog is not shown issue" am: 16d5332473

Change-Id: Idfcfc8f25ec10ca7e3df6eafec65c91037558cc2