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

Change-Id: Iae323b6c677a45d9e39c4809f825178f761a8628