Also, bug fix in EditoInfo.makeCompatible(). bug: 3296883 Change-Id: Icc663b375cffbe1f4506d1758d624a1acca3576b