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

Change-Id: Ia637e1c6caccf33137cde413779911dab5677147