Move default implementation from 1.1 to 1.0 am: 1c0e3b7e57 am: 5024d6627d

Change-Id: I2035bf1e6fbf910ea42f0c576d822f0754211937