Merge "Add support for default impl" am: 0e67630e99 am: c0fe35850d
am: a4fa61a81b

Change-Id: If0bec2d50b0b2096fead3101a8a58fac4b3a5146