Merge changes from topic 'dex' am: f665781c74 am: 8a4afd3dad
am: 5949d0dcdc  -s ours

Change-Id: Ic85e62a9ad2a7c1bd04a70776ebeb816a67a4e72