Merge "Make getEcno() public." am: caa960b766
am: f6a1a0c850

Change-Id: If83ae0f74aae78039d1013967f08f54e47c2658d