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

Change-Id: If9f91d0612fc62a11a3a3b1bbc08df76ff1e4584