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

Change-Id: I83bb670f0ff9a49ab32c6d08c59e936e0b74e479