Chrome fix
Change-Id: I8b5b090175cfc43e3986181e711c12de99b7a046