Update Echo to master (getting new maintenance script)

Change-Id: I141289206f7694e4c4b937c281dae81bef1bea4b