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

Change-Id: I79aa3a24a3982ca60bb1b51323e0b9f6736a7119