User builds can ES&D

Change-Id: I3624318cc4f4df696d5b33438a354956e1f429ca