Merge changes from topic "ext-dex-signature-arg"
am: 3a04004876

Change-Id: I87daa575ee7ea2ed76b96583bc3cd173f19dbc5d