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

Change-Id: I1038c7e807080205a38e725d02bef069a6d8e2c2