Merge changes from topic 'secondary-dex' am: ad79651822
am: ba1d417eca

Change-Id: Ie579b31a131b475449fec93f0bf5527677022edd