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

Change-Id: I77e80eaf9274a64348c80b251e865ecdb6e53dbc