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

Change-Id: Idcdf7a84b25376aca209ded1cdbb5d1831578810