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

Change-Id: Id3238ab619c35cea877ad50fba5a0e6729e10346