Merge changes from topic 'secondary-dex' am: 9e88c53337
am: a400ccdaa0

Change-Id: I95ed98e02fe5a54699814eb617697852095ca55d