Update Echo to master for I84e8f874e

Change-Id: Ie29f85259d4bc198aec73e32840382eb38902017