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

Change-Id: I7826a3943ea39d8139d9100ac65d1e9d2f52da84