Merge "Update Ember's email" am: 0e6683ef7e
am: bf7239e2fb

Change-Id: I394749d83ceac0e1373aa83f5f85ccf9cb29483b