Merge "Change the Theme of the ECBM AlertDialog" into pi-dev
am: 7e99e5d895

Change-Id: I9d38d89a6e364bd46921874e96f0f7125bc6088b