G2: ES&D, WTFALDSKJHALDKJH

Change-Id: I1c5840797dfe85597612298a426fe9235aeda574