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

Change-Id: I84ca0c35b47d29cbddad7cd084d7e23e41b46b97