[automerger skipped] Merge "Update Ember's email" am: 0e6683ef7e am: bf7239e2fb am: 159091ed3f
am: 4ac4411300 -s ours
am skip reason: change_id Icd9ae23a74175a98f8495f71c85b69891d387df0 with SHA1 93fc45b1a7 is in history

Change-Id: Ibdf34ab9b0a5d15ce180d1e711aee840897a708a