Update Echo to master for I84e8f874e

Change-Id: Idbdebbe7a4c4a616f39fcd6e1d4ea54bbe87a223