Merge changes from topic 'secondary-dex1'
am: d56d98b860

Change-Id: Ia9c1329584597a6f30aeaa2bd8e8c979705d8eea