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

Change-Id: I3444fa1e87d54c67b1aa11a576f27e3a0447953d