Revert Echo to 1.24wmf16 branch

Change-Id: Id4ecf218484228fae3dee6f6a251911b7b679e1a
Merge "Revert Echo to 1.24wmf16 branch" into wmf/1.24wmf17