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

Change-Id: I67b299b712bd1172d88c55f7a1db82a741af87a1