evenin commit

Change-Id: I986b55e88158549ed909f8569150b2b833b5d7da