Move default implementation from 1.1 to 1.0 am: 1c0e3b7e57

Change-Id: If6834baa96b6e8df954948771c7c634d7a182eb1